Made APIs consistent
version 0.1.2