Added size support, cleanup