Improved abstraction

Removed direct access to private prototype info
NOTE: Has not been tested yet due to time constraints today