Number of changes to simplify methods used in interfaces, found a solution around Eloquent's working.

Signed-off-by: Ben Corlett <bencorlett@me.com>