Increased consistency
Added interface implementations